near to have the first proto
Merge remote-tracking branch 'origin/greg'

Conflicts:
	Project/src/com/stratos/beautifulinfinittextualexperiment/MainActivity.java
Merge de master