turned pink buttons off, updated version number
Merge branch 'master' of https://github.com/RhythmDigital/gsk

Conflicts:
	GSKOncology/src/com/wehaverhythm/gsk/oncology/Constants.as
Merge branch 'master' of https://github.com/RhythmDigital/gsk
longer timeout
Merge branch 'master' of https://github.com/RhythmDigital/gsk
Merge branch 'master' of https://github.com/RhythmDigital/gsk