Local commit
Merge branch 'master' of https://github.com/hectorsim/idp.git

Conflicts:
	Breeze/AndroidManifest.xml
	Breeze/bin/AndroidManifest.xml
	Breeze/bin/Breeze.apk
	Breeze/bin/classes.dex
	Breeze/bin/classes/com/dev/breeze/LoginActivity$1.class
	Breeze/bin/classes/com/dev/breeze/LoginActivity.class
	Breeze/bin/classes/com/dev/breeze/MainActivity$DrawerItemClickListener.class
	Breeze/bin/classes/com/dev/breeze/MainActivity.class
	Breeze/bin/classes/com/dev/breeze/R$color.class
	Breeze/bin/classes/com/dev/breeze/R$drawable.class
	Breeze/bin/classes/com/dev/breeze/R$id.class
	Breeze/bin/classes/com/dev/breeze/R$layout.class
	Breeze/bin/classes/com/dev/breeze/R$string.class
	Breeze/bin/classes/com/dev/breeze/R$style.class
	Breeze/bin/classes/com/dev/breeze/R$styleable.class
	Breeze/bin/dexedLibs/android-support-v4-6c568d5931403f4ea6ab50c81cd0ed3f.jar
	Breeze/bin/resources.ap_
	Breeze/gen/com/dev/breeze/R.java
	Breeze/res/layout/activity_main.xml
	Breeze/res/values/colors.xml
	Breeze/res/values/strings.xml
	Breeze/src/com/dev/breeze/MainActivity.java
Chun Yang helpp
Merge branch 'master' of https://github.com/hectorsim/idp.git