add forms for image upload when android version is lower than 2.3
change the appearance of the popup window in page "limit"
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.html