add navigationBar
Merge branch 'feature/BCA-change-one' into develop

Conflicts:
	Sudcaliforniano/AppDelegate.m