Merge branch 'testing' into ics

Conflicts:
	README.rst
Merge branch 'ics' of http://github.com/androportal/gkAakash into ics

Conflicts:
	README.rst