remove local.properties
simplify
prevent form submission
trailing whitespace
remove generated
ignore
remove extra mime media, set AAR back to foursquare
Merge branch 'P2P'