Social View - offline version
Merge branch 'master' of ssh://github.com/bladenight/bladenightapp-android
new action addFriend
Merge branch 'master' of ssh://github.com/bladenight/bladenightapp-android

Conflicts:
	res/values/strings.xml