Removes fast click for now as it is acting weird.
Merges master into production branch