Changes for 2015
Merge branch 'master' into fe

Conflicts:
	vendor/plugins/common_engine