Merge branch 'hotfix/0.1.3.1'
Fixed some bugs
Merge branch 'release/0.1.4'

Conflicts:
	GLViewScroller/GLViewScroller.m
Merge branch 'release/0.1.4'
Merge branch 'release/0.1.5'

Conflicts:
	GLViewScroller/GLViewScroller.m
Merge branch 'release/0.1.5.1'
Merge branch 'release/0.1.6'
Fixed bug where a crash occurred when scrolling with nil options
Merge branch 'hotfix/nilValues' into develop