updated to integrate with server side script
Merge branch 'master' of https://github.com/ecocache/ecocache

Conflicts:
	app/app/models/Category.php
	app/app/models/Environment.php
	app/app/models/Object.php
Merge branch 'master' of https://github.com/ecocache/ecocache