BUg Fix
Merge
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git

Conflicts:
	DesignProject/src/com/designproject/controllers/ContractController.java
FIxed broken merge. STUPID GIT.
Fixed bug on contract controller
nav icons stuff
Merge branch 'master' of
https://github.com/nlubczynski/DesignProject.git into AddNewNavItems

Conflicts:
	DesignProject/src/com/designproject/controllers/DisplayListActivity.java
	DesignProject/src/com/designproject/controllers/DisplaySpecificClientLocationActivity.java
	DesignProject/src/com/designproject/controllers/NavigationDrawerActivity.java