Casting bar changes
Merge branch 'master' of https://github.com/kweicht/AwesomeUI

Conflicts:
	main.lua