Initial commit
Updated Maverick to be a micro-framework.
Merge branch 'dev' into new-master
Merged master