Went over last merge
Restrict to Qt 5.1.0 and higher

Because of the use of QHash's initializer-list, that was introduced in 5.1.0
Updated Travis to use Qt 5.1.1
Updated Core submodule
Added support of TOX_USERSTATUS
Fixed size of Input Widget
Fixed renaming not working properly
Added destructors
Fixed order of context menu actions
Fixed Friend Address being shown instead of Client Id
Merge branch 'origin/master'

Conflicts:
	projectfiles/QtCreator/TOX-Qt-GUI.pro
	src/messagedisplaywidget.cpp
	src/messagedisplaywidget.hpp
fix merge error
Fixed Message Display differentiating senders wrongly

Message Display was differentiating senders by their username, which is not
unique. When two clients had same name, messages were dislayed as if it was one
person writing.
Add animation settings option
and fix bug
Merge branch 'upstream/master'

Conflicts:
	src/messagedisplaywidget.cpp
	src/messagedisplaywidget.hpp