Merge branch 'release/0.5.2'
Merge branch 'release/0.5.3'
Merge branch 'release/0.5.4'
Merge branch 'release/0.5.5'
Merge branch 'release/0.5.6'
Merge branch 'release/0.5.7'
Merge branch 'release/0.5.8'
fix list group in edit user
fix program views
Merge branch 'hotfix/0.5.9' into develop

Conflicts:
	app/webroot/css/basic.css
Merge branch 'develop' into feature/tests_failed
if shortcode is null show Configure shortcode