Creating template
Some commit message
Some commit message
commit1
commit1
commit2
commit3
commit4
commit5
commit6
fixing build
Remove hot subsection
removing hot subsections
removing hot subsections
merge with github
delete target folder
merge github
Merge branch 'master' of ssh://back-onlinerreader.rhcloud.com/~/git/back

Conflicts:
	.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
	.idea/libraries/Maven__mysql_mysql_connector_java_5_1_25.xml
	.idea/libraries/Maven__org_jsoup_jsoup_1_7_3.xml
	.idea/libraries/Maven__org_postgresql_postgresql_9_2_1003_jdbc4.xml
	.openshift/config/server.xml
	.openshift/config/settings.prod.xml
	.openshift/config/settings.rhcloud.xml
	.openshift/config/settings.stg.xml
	.openshift/cron/weekly/chronograph
	pom.xml
	src/main/java/com/onliner/reader/model/ForumCommentsPage.java
	src/main/java/com/onliner/reader/model/ForumConstants.java
	src/main/java/com/onliner/reader/model/ForumThreadsPage.java
	src/main/java/com/onliner/reader/model/MainPage.java
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.html