Fixed localisation tags
Code cleanup
Merge branch 'development'