no message
aa
Merge branch 'master' of https://github.com/sameeraje/cloud4s

Conflicts:
	cloud4s/.idea/workspace.xml
	cloud4s/target/SpringAppSecurity.war
	cloud4s/target/cloud4s.war