Merge branch 'hotfix/hotfix_2013_06_18_sysadmin'
added conditions for editing location when no project_transalation yet
Merge branch 'hotfix/2013_19_06_add_new_project' into develop