Merged changes
Updated views, needs to be merged with master
Merged master into feeds
twaccess instea of access
Merged feeds into master