Merge branch 'master' of /Users/mbramirez/Desktop/CSCI_Chico/Fall 2014/SE/quantumNote with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_my_activity_drawer.xml
Added sizing options for ActionBar/Launcher Icon