to nic

nic
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project Android/Project Android.int
	Project Android/Project Android.rsc

swag