contacts
Merge branch 'master' of http://github.com/nukeruseg/bomjara into babaika

Conflicts:
	NSProject/.idea/misc.xml
	NSProject/NS/NS.iml
	NSProject/NS/src/main/res/values/strings.xml