Big cleaning ...
Starting from scratch ;-)
Merge branch 'master' of https://github.com/korczis/apollo

Conflicts:
	.gitmodules
	Build.md
	Gemfile
	Rakefile