fixed compilation error
Merge branch 'origin/master'

Conflicts:
	Sutapu/.idea/workspace.xml
	Sutapu/src/com/sutapu/ui/MainActivity.java