Prevent click jacking
Merge branch 'temp2'