Modified headline: #Modified_AWESOME :3
Merge branch 'feature-newheadline' into develop
Merge branch 'develop' of https://github.com/sriwanlop/samurai into develop

Conflicts:
	src/main/java/conf/messages.properties
Merge pull request #2 from kikapoe/develop

Pull request