* added
Merge remote-tracking branch 'origin/master'

Conflicts:
	p2pBoard/.idea/workspace.xml
* added serious comment