fixed model reference
[OE-3914] fixed collation
[OE-3731] Adjusted asset paths
[OE-3731] Fixed asset references
[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop
merge develop to fix table type creation errors +temp changes

Conflicts:
	migrations/data/m130913_000012_consolidation_for_ophtrlaser/02_ophtrlaser_laserprocedure.csv