merge
Merge branch 'master' of https://github.com/bevins2016/DCCApp

Conflicts:
	AndroidManifest.xml
	res/layout/action_item_fragment.xml
	src/com/example/dcc/EReportLauncherFrag.java
	src/com/example/dcc/fragment/MenuFragment.java