tag v1.1
40cf74883ab06683cff5305add0efd1e847bd79b
Jordon <jordon@localhost>
2014-06-12 01:12:16 -0700

Tagging as v1.1


--------------------

Jordon:
	- prevent button from updating in combat
