Add android part
Merge Server and Android parts

Conflicts:
	presentation/reveal.js/index.html