Modified headline: #Modified_AWESOME :3
Merge branch 'feature-newheadline' into develop
Modified message from Goodmoring to Afternoon
Merge branch 'feature-new-headline' 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
Modified version 1.0
Merge branch 'release-1.0'