Merge remote-tracking branch 'origin/master'

Conflicts:
	include/ResourceManager/SFML/ManagedFont.hpp
Fixed Conflicts
Merge branch 'master' of https://github.com/stevehalliwell/sfml-resman