Modified *default and test data*
Merged commit chris/chrissi

Merge branch 'master' of github.com:SublanTV/Interaktionssystem

Conflicts:
	sql/insert_default_data.sql
	sql/insert_test_data.sql