Merge pull request #48 from conorfennell/master

Login redesign
Update UI/UX for battle screen, combine solo mission controllers, and add ability to make battle requests
Hide back button for screens accessible from menu
Show correct quests in active/all/completed, and implement alerts when they complete
Move gold and shortDesc variables to quest Obj
Merge pull request #53 from aellawind/master

Show correct quests in active/all/completed, and implement alerts for when quests are complete
Update UI/UX for battle screen, combine solo mission controllers, and add ability to make battle requests
Hide back button for screens accessible from menu
Update icomoon fonts
Add back solo mission detail state
Fix bug where 'victorious' pop up always shows whether player wins or loses
Add ability to click on subheading to open and close list
Update UI elements
Merge branch 'master' of github.com:fatchicken007/fitrpg-ionic

Conflicts:
	www/js/controllers/battleCtrl.js
	www/templates/tab-battle.html
	www/templates/tab-quest.html
Merge pull request #49 from fatchicken007/master

Update UI/UX for battle screen, combine solo mission controllers, and ad...
Ability to refresh quest page to see status, progress bar for status of quest added
Merge pull request #57 from aellawind/master

Ability to refresh quest page to see status, progress bar for status of ...
Add css for weapons/inventory detail pages, start help page
Create the HTML for the help page
Merge pull request #58 from aellawind/master

Create the HTML for the help page