Merge branch 'hotfix/2013-06-18-missing_locations'
updating trans
Merge branch 'hotfix/2013_06_20_finish_trans' into develop