Merge branch 'master' of github.com:eventick/fortal

Conflicts:
	README.md