Merge branch 'master' of https://github.com/DmitryMiroshnichenko/jira-mailru-weekly-reports

Conflicts:
	src/main/java/ru/mail/jira/plugins/common/Consts.java
	src/main/resources/atlassian-plugin.xml
	src/main/resources/sql/obt-deployed-features.sql

git-svn-id: svn://f1svn/atlassian/plugins-jira/jira-mailru-weekly-reports/trunk@1096 36bdb4e4-e74f-4cf3-8c97-b015e32094b9
small fixes

git-svn-id: svn://f1svn/atlassian/plugins-jira/jira-mailru-weekly-reports/trunk@1097 36bdb4e4-e74f-4cf3-8c97-b015e32094b9
version up

git-svn-id: svn://f1svn/atlassian/plugins-jira/jira-mailru-weekly-reports/trunk@1098 36bdb4e4-e74f-4cf3-8c97-b015e32094b9
Merge branch 'master' of https://github.com/DmitryMiroshnichenko/jira-mailru-weekly-reports