Merge branch 'development'
added modal to ckan layout
added more modal styles
Merge branch 'development'

Conflicts:
	themes/odaa/css/odaa.styles.css
	themes/odaa/sass/layout/_ckan.scss
Fixed merge conflict
Added latest comment on views
Changed forum view to reflect latest comments order
updated gitignore - no idea folder
Merge branch 'development'

Conflicts:
	.gitignore
Merge branch 'development'
Added check for api key
Added strtolower
Added uppercase check
Make-file for update of core and modules
Update of media-module
Updates for media_youtube
Merge branch 'master' into development