Initial commit, adding all of the files from MEANJS.
Resolving conflict with initial commit.
Merge branch 'dev'