navigation block
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/pils/post2/client/Post2.java
	src/com/pils/post2/client/conversation/ConversationService.java
	src/com/pils/post2/client/uiblocks/NavigationBlock.java
refactoring
Merge pull request #2 from tzh/master

refactoring