Merge branch 'release/0.5'

Merged develop into master
Controllers can load views