import project
Merge branch 'master' of ssh://git@github.com/y3shop/simplecms.git

Conflicts:
	src/test/java/com/roki/test/MyTest.java