migration init commit
some gelding
update
...
idasdasw
some
tt
Merge branch 'master' of github.com:Firfi/commentarius

Conflicts:
	.idea/compiler.xml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
	commentarius.iml
	pom.xml
	src/main/java/ru/megaplan/jira/plugin/commentarius/action/admin/AddTemplateAction.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/action/admin/ConfigureGradesAction.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/action/admin/ConfigureProjectsAction.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/action/admin/ConfigureTemplatesAction.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/ao/ShabloniusConfigService.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/ao/bean/MPSTemplateMessage.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/ao/bean/mock/IMPSTemplateMessageMock.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/ao/impl/CommentariusConfigServiceImpl.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/ao/impl/MPSGradeServiceImpl.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/ao/impl/ShabloniusConfigServiceImpl.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/customfield/UserPropertyCFType.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/rest/MPSTemplateMessageResource.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/rest/MPSUserPropertyResource.java
	src/main/java/ru/megaplan/jira/plugin/commentarius/rest/UserPropertyResource.java
	src/main/java/ru/megaplan/jira/plugin/webfragment/condition/CommentariusProjectsCondition.java
	src/main/java/ru/megaplan/jira/plugin/webfragment/webpanel/CommentariusMPSWebpanel.java
	src/main/java/ru/megaplan/jira/plugin/webfragment/webpanel/ShabloniusMPSWebpanel.java
	src/main/resources/atlassian-plugin.xml
	src/main/resources/includes/js/commentarius.js
	src/main/resources/includes/velocity/addTemplate.vm
	src/main/resources/includes/velocity/configureTemplates.vm