Avoid use View as View conflict

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update README

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'master' into develop