TISTUD-4035 Supporting changes for dashboard to show alloy templates
Merge branch 'development' of https://github.com/aptana/studio3 into TISTUD_6199_STUDIO
Incorporating feedback.