Tom Fulton a0ff42a84f Merge branch 'master' into fix/unique-aliases ...

Conflicts:
	app/views/archetype.default.html

2014-06-25 21:49:24 -04:00

..

archetypecustomview.js

Fix for #160

2014-06-25 10:28:30 -04:00

archetypeproperty.js

Make property aliases even more unique

2014-06-25 21:46:46 -04:00

localize.js

WIP on switching to a directive based localization

2014-02-07 16:00:47 -05:00