ngu
Merge branch 'sprint1' of https://github.com/thunguyen5885/omebee_android into sprint1

Conflicts:
	Omebee/.idea/misc.xml