Fixed startup problem on Android
Basic grouping
Correct sort order in view
Merge branch 'master' of github.com:TomTom101/MacRefurbishedShop

Conflicts:
	app/controllers/Page1.js
Merge branch 'refs/heads/grouping'

Conflicts:
	app/views/Page1/index.html