added hotel app android
Merge branch 'master' of https://github.com/alyssialui/NCMS

Conflicts:
	COMP3900/.metadata/.log
	COMP3900/.metadata/.plugins/org.eclipse.cdt.core/.log
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.history/ae/50651b01c19c00121dced60f971383a2
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.history/f2/c0ab2090da9c001217518ee3c9914c1b
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/.markers
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/CaptureActivity/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/a0/d6/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/e4/81/1b/1b/history.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/history.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.indexes/properties.index
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/.markers
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/NCMS/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.projects/google-play-services_lib/org.eclipse.jdt.core/state.dat
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.root/6.tree
	COMP3900/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/1478601789.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/1706783849.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/1967834557.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2224373348.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2237921350.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2402366007.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2626224094.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/2964875969.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/3082061570.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/3324480131.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/359367461.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/3904432842.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/3976034903.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/4089069468.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/4218145482.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/4290392135.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/541640445.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/625924941.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/65240663.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/659425946.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/960718289.index
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	COMP3900/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	COMP3900/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	COMP3900/CaptureActivity/bin/captureactivity.jar
	COMP3900/NCMS/bin/jarlist.cache
	COMP3900/google-play-services_lib/bin/google-play-services_lib.jar