Merge remote-tracking branch 'kus/master'

Conflicts:
	agros2d-library/hermes2d/plugin_interface.cpp