add editTrack (in progress) and small style changes
Merge branch 'master' of github.com:oss-fruct-org/gets
Merge branch 'master' into obstacle-service
Update config.inc

Fix admin user e-mail
fix server url
add compatibility with php 5.3
Merge branch 'master' into obstacle-service

Conflicts:
	service/include/config.inc
fix url for service
set usable return value
add category function
Merge branch 'master' into obstacle-service