RequireJS and views refactoring
Merge branch 'requirejs'