Move code into src/
Merge branch 'master' into src

Conflicts:
	qtox.pro
	src/widget/form/settings/avform.h
	src/widget/selfcamview.cpp
	src/widget/selfcamview.h
	src/widget/widget.cpp
	widget/selfcamview.h
	widget/videosurface.h
Merge pull request #405 from dubslow/src

Move code into src/
Merge branch 'master' into debian/unstable
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
Merge branch 'debian/unstable' into ubuntu/trusty

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>

Conflicts:
	debian/changelog
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>