Auto generated files
Ignore local.properties
Automatic changes from upgrading to IntelliJ 12
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore