Renames
Delete redundant files
Ran durandal optimizer
Merge branch 'dev'