Fix APSTUD-4221 Externalize UI strings in HTML ruble
Merge branch 'release' into development
Fix APSTUD-2129 "select tag area" feature
Fix APSTUD-2129 "select tag area" feature
Merge branch 'release' into development
Merge branch 'release'
Defined tags for the project templates.
Add logo for HTML 5 template, add "Web" tag for all
Merge branch 'release'
Merge branch 'master' of git://github.com/aptana/html.ruble

Conflicts:
	templates/project_templates.rb