updates
updates
Merge branch 'master' of https://github.com/modemlooper/BuddySuite

Conflicts:
	.DS_Store