Added a settings page and linked it to nav drawer
Merge branch 'settingsPage'

Conflicts:
	DesignProject/AndroidManifest.xml
	DesignProject/res/values/strings.xml
	DesignProject/src/com/designproject/controllers/NavigationDrawerActivity.java