Modified the formatter class and fixed some bugs
Merge branch 'master' of https://github.com/Nacorpio/pjSocial

Conflicts:
	src/com/nacorpio/pj/social/format/DataFormatter.java