ubuntu forced commit
Merge branch 'develop'
working copy now on master
Merge branch 'develop'
update navigation
remove lh-settings
update MVC structure
Merge branch 'render-feature', remote-tracking branch 'origin' into develop
Merge branch 'develop', remote-tracking branch 'origin'
add before() to check settings before allowing project mapping
Merge branch 'master', remote-tracking branch 'origin' into develop