Changes
Merge branch 'master' of github.com:trail-badger/ios

Conflicts:
	resources/Default-568h@2x.png
Changes to CSS and changes to Icon