commit3
Merge branch 'branch3'
Merge branch 'master' of https://github.com/arpanaj/proto

Conflicts:
	inno/src/com/example/inno/MainActivity.java