- merge 20140401-dev-stable into master
Copyright change.
Merge remote-tracking branch 'origin/20140401-dev-stable'

Conflicts:
	libs/op
- opus was pointing to wrong sub module commit
Fixed loading setting bug.
- public peer file was not shared properly in multi-party call
Merge branch '20140401-dev-stable' into feature-20141030-3-way-im-fix
Temp fix for deleting logged in user name.
- latest dev-stable
Merge remote-tracking branch 'origin/20140401-dev-stable'

Conflicts:
	libs/op
Updated submodule