fixes
fb stuff
Merge branch 'master' of https://github.com/HabitRPG/habitrpg-mobile

Conflicts:
	app/scripts/app.js
	app/scripts/services/authServices.js
fixes
UI work
notifications, UI, phonegap linking fix
delete stuff
bugfixes
auth adding
Merge branch 'master' of https://github.com/litenull/habitrpg-mobile

Conflicts:
	app/index.html
	app/scripts/controllers/wrapperCtrl.js
	app/styles/beta.css
	app/views/list.html