bump
Merge branch 'master' of github.com:skad/Android-M2IHM

Conflicts:
	.idea/misc.xml
	Android-M2IHM/Android-M2IHM-Android-M2IHM.iml
	Android-M2IHM/src/main/AndroidManifest.xml
	Android-M2IHM/src/main/res/layout/fragment_main.xml