Add server dialog
Merge branch 'master' of https://github.com/weidongshao/docsApp

Conflicts:
	src/info/androidhive/slidingmenu/ScreenSlideActivity.java