Reformatted Users Views to eliminate back links and use Lanceng format
Merge branch 'develop' into stores
Stores resource and file cleanup