Updated generic view
Merge branch 'develop' of https://github.com/zliniguez/OWC2014.FullStopNet into develop