Working on levels
Merge branch 'master' of https://github.com/amalm/codingcontest

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_project_levels
	app/tmp/cache/models/myapp_cake_model_default_project_list
	app/tmp/cache/models/myapp_cake_model_default_project_tasks
	app/tmp/cache/models/myapp_cake_model_default_project_users
	app/tmp/cache/persistent/myapp_cake_core_cake_de-de
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_de-de
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
Upload&Download done
Conflicts removed