Merge branch 'release/3.1.1.2' into develop
updated macros
Merge branch 'develop' of github.com:ryanolson/flask-bootstrap3 into develop
Merge branch 'master' of github.com:ryanolson/flask-bootstrap3 into develop
merging changes from cloud server
bumped version to 3.1.1.3
Merge branch 'release/3.1.1.3'