Rafael Schouten 89ce4ba632 Merge branch 'master' into bugfix ...

Conflicts:
	app/models/enterprise.rb

2014-10-21 08:51:23 +11:00

..

images

Merging master into my branch to make it up to date

2014-09-12 14:48:19 +10:00

javascripts

Merge branch 'master' into bugfix

2014-10-21 08:51:23 +11:00

stylesheets

Change ent type page, simplify!

2014-10-17 11:17:53 +11:00