backup
backup
backup
backup
Merge branch 'master' into #56-compatibility-HTML5
Merge branch '#63-UIGroupProps' into #56-compatibility-HTML5-2
Merge branch '#63-UIGroupProps' into #56-compatibility-HTML5
Merge branch 'master' into #56-compatibility-HTML5

Conflicts:
	src/wap/public/css/login.css
	src/wap/public/images/cheked.png
	src/wap/public/images/nocheked.png
backup
Merge branch 'master' into #56-compatibility-HTML5

Conflicts:
	src/wap/public/js/wap.js
backup
closes #56
Merge branch '#56-compatibility-HTML5'