Incorporate changes through internal release 4.1.4
Merge pull request #5 from Tapjoy/feature/update_4_1_4

Incorporate changes through internal release 4.1.4