reverting the api since its not ok
Merge branch 'apiv2' of https://github.com/lefnire/habitrpg into apiv2
Merge branch 'develop' into apiv2
apiv2: reapplying cleanup fix of b88c2ad
apiv2: bugfix in handling doneCount (we really should move to Q instead)
Gems and Eggs
Typo fixes

Corrected three typos in English app.json
"integrals" instead of "integral" in tour description of rewards
"effected" instead of "affected" in Tavern description
"Habit an open" instead of "Habit is an open" in Remove Ads
Update app.json

Add'l English syntax fixes to Tavern description
Merge pull request #1296 from SabreCat/develop

Typo fixes
Answer cron FAQ in settings text

Update custom day start label to mention it works off user's time zone
Merge pull request #1297 from SabreCat/master

Answer cron FAQ in settings text
Fix typos and update current-events notice on 500 error

Brings "Server restarting" message up to date re: Angular rewrite.
Merge pull request #1299 from lefnire/sabe_fixes

Update to 500 error message
apiv2 fix to pending op (@litenull)
change derby-ui-boot url to point to our fork, for #741
possible better handling of empty POST, yan's weird User.log({}) thing.
apiv2: unshift to tasks, rather than push
add lib to gitignore for now, so we can compile. may want to remove
this ignore in the future
apiv2: fix transform form user.tasks => user.habits/dailies/etc,
maintain sort order
apiv2 more of previous (task xform)