Merge branch 'i25025' into development
Merge branch 'master' into development

Conflicts:
	assets/javascripts/usability.js
Merge branch 'master' into development
Merge branch 'master' into development
Merge branch 'master' into development
Merge branch 'master' into development
#25906 remake login form
Merge branch 'i25906' into development
btn fix
Merge branch 'i25906' into development
minor fixes
Merge branch 'development' into i25906
Merge remote-tracking branch 'origin2/i25906'
no message