added comment for test
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_0_1.xml
Merge branch 'master' of C:\Users\PatrickLP\Android Studio Projects\AutoPI-Android with conflicts.