Integrated android project page, as well as misc. updates.
Merge origin/master

Conflicts:
	public_html/android.html