Merge branch 'develop'
added php 5.3 support in travis
Merge branch 'develop'
Merge branch 'master' into develop