Merge master into updates
Revert "Merge master into updates"

This reverts commit ba663278be86c78fff130121435e25b5c57b06b7.
Update entity module
Update media module
Update menu views module.
Update core to 7.26
Revert "Update menu views module."

This reverts commit 447a7bde9139b3f408ecac689a7e367fcf43e982.
Merge branch 'master' into Updates
update ctools module
update webform module
update webform validation module
Merge branch 'Updates'