navigation finish in ios
Merge branch 'master' of https://github.com/jakedunc/EstiMates

Conflicts:
	Resources/ui/common/FacebookLoginView.js
Merge branch 'master' of https://github.com/jakedunc/EstiMates

Conflicts:
	Resources/ui/common/FacebookLoginView.js