implemted Ticket #361
Merge branch 'dev' of github.com:ubc/iPeer into dev

Conflicts:
	app/config/sql/delta_7.sql