final acceptance [2014-05-31]

Signed-off-by: Mohamed Refaat <eltntawy@gmail.com>
comit
Merge branch 'master' of https://github.com/eltntawy/SimpleCMS

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/org.springframework.samples.service.service/Simple_CMS_Mohamed/pom.properties