Merge Kram
Merge Kram
Merge branch 'master' of https://github.com/bDino/VS2013-2014

Conflicts:
	A1/2 - Server/queuemanager.erl
Merge branch 'master' of https://github.com/bDino/VS2013-2014