scollview progress
Merge branch 'master' of github.com:liquidg3/liquidfire-curium

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:liquidg3/liquidfire-curium

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of github.com:liquidg3/liquidfire-curium

Conflicts:
	views/LabelView.js
	views/View.js