New logo and platform configuration
move logos to uploads directory
move logos to uploads directory
move logos to uploads directory
track gitignore sub file
git ignore fix
delete subdirectory git ignore
Merge remote-tracking branch 'upstream/master' into alt-master

Conflicts:
	.gitignore
Merge pull request #349 from solispauwels/alt-master

New logo and platform configuration