...
Merge branch 'master' of github.com:lemade/outside

Conflicts:
	outside_development
re-edit database structure and re-adjusted all models, controllers and views