tweaks
Moved extra_css and extra_js out of compress tags
Merge branch 'feature/showrca2014' into develop

This reverts commit 7b0297971b9b3eef79c653fcb55aa50d99cd8e08.
Merge branch 'feature/showrca2014' into develop
Merge branch 'develop'