Updated changelog for 1.5.4
Updated podspec
Merge branch 'release-1.5.4'
Merge branch 'master' into develop