folder rename
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidBootstrap/AndroidBootstrap.iml