Started adding migrate live templates
Merge branch 'master' of github.com:jurcello/triquanta-phpstorm-templates

Conflicts:
	templates/triquanta.xml
Started adding apachesolr Live tempates.