Rafael Schouten 20a94b4365 Merge branch 'master' into migrate_ent_types ...

Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb

2014-10-07 10:52:26 +11:00

..

controllers

…

services

add some angular documentation

2014-10-06 22:59:06 +11:00

enterprises.js.coffee

…