Merge branch 'master' of github.com:jamstarter/nectarmvc