Merge branch 'hotfix/fbloginhide'
Merge branch 'release/v1.13'
GA Script
hotfixes
Mark Moore Highlighted Maker
Merge branch 'master' into develop
Merge branch 'master' into develop

Conflicts:
	src/main/html/login.html
Jail broken
Bug Fix
Improvements
Changed some localization stuffies #gklst
FAQ and Movies
Google Chrome update
Fan Button changes
Play Fan image
Larger image
Some help for new users...
Bug in explain
gettext update
fixed #146