button design change and event view
Merge branch 'zaki7' into development

Conflicts:
	lib/MysqlAdapter.php
Resolved