..
GUI + User Class
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/android/otpc/know/MainActivity.java
	src/android/otpc/know/RegisActivity.java