Fix for failing Travis CI on static method test for php 5.3 & 5.4
Testing Lazy Loading of Images

[ci skip]
Locale static Helper class renamed to MyLocale, due to possible conflict in Travis CI
Lots of localization fixes
Added 404
GA Script
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