before merge
 merged
Bunch of stuff for view perms:
* changed things to phrases
* added auto complete
Sorted out .epmi file

Merge branch 'master' of github.com:mattrosstaylor/edshare_core

Conflicts:
	edshare_core.epmi