added profilepicker
:w
D
C
A
added profilepicker
Merge branch 'master' of https://github.com/epikur90/sw14_xp_05

Conflicts:
	PinKee/AndroidManifest.xml
	PinKee/project.properties
	PinKee/src/com/sw14_xp_05/pinkee/ChatActivity.java
merged
Merge branch 'master' of https://github.com/epikur90/sw14_xp_05
added and merged profile picker