add apostrophe validation in jquery for dialogue and request and cakephp for separate message
refactor Request and Action validation
fix refactor save/edit of request with Action validation
increase saving timeoute
add virtual model for reusable subdocument
adding program shortcode on program header
merged develop into feature
refactoring appController and different views
change country code to country name and reformatting the dispaly
refactoring Element and removing spaces at the end of the line
matching shortcode color
merge conflicts
Merge branch 'feature/remove_program_subtitle' into develop
Merge branch 'develop' into feature/validation_apostrophe

Conflicts:
	app/View/Elements/localization.ctp
added if statement on the shortcode in the constructclasses
changed variables in controller test
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
changed message color to red for shortcode configure