Maj readme
Maj readme
Maj logo
Merge branch 'master' into dev-modules

Conflicts:
	.idea/workspace.xml