- 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.
Merge remote-tracking branch 'origin/20140401-dev-stable'

Conflicts:
	libs/op
Updated submodule
Updated submodule
Updated paths