nav back after company view
Merge branch 'master' of https://github.com/orangedog22/dealfish
Merge branch 'master' of https://github.com/orangedog22/dealfish
Merge branch 'master' of https://github.com/orangedog22/dealfish
Something
Merge branch 'master' of https://github.com/orangedog22/dealfish

Conflicts:
	.settings/com.appcelerator.titanium.core.prefs