Better clustering!
Merge branch 'master' of https://github.com/OhmTeam/FriendMapper.git

Conflicts:
	src/com/ohmteam/friendmapper/data/MarkerManager.java
Code Formatting. Also changed the clustering radius to 50px from 100px.
Added a java formatter preferences file that we can all share. It
changes the line and comment maximum widths to be a lot longer than the
defaults. Import the java-formatter.xml file through the eclipse
preferences for java code formatting.