work of 7-11-14
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/AudioManager.cpp
	TowerDefense/AudioManager.h