Merge branch 'dev'
space test
updating the name of the package
loosening the version requirement on mustache
Merge branch 'dev'
space test
Merge remote-tracking branch 'origin' into dev
fixing conflict