Merge remote-tracking branch 'upstream/develop' into ui-tweaks

views/app/footer.html

@@ -19,7 +19,8 @@
             {else}
             <div class='pull-right'>
                 <button class='btn' x-bind="click:emulateNextDay">Emulate Next Day</button>
-                <button class='btn' x-bind="click:cheat">Add GP & Exp</button>
+                <button class='btn' x-bind="click:emulateTenDays">Emulate 10 Days</button>
+                <button class='btn' x-bind="click:cheat">Insta Level</button>
                 <button class='btn' x-bind='click:reset'>Reset Level</button>
             </div>
             {/}

views/app/header.html

@@ -20,7 +20,7 @@
             <div class="progress-bars">
                 <div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
                     <div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
-                    <span class="progress-text"><i class=icon-heart></i> {round(_user.stats.hp)} / 50</span>
+                    <span class="progress-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
                 </div>
 
                 <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">