gettext update
fixed #146
Warking on #149
Merge branch 'hotfix/paymentupdate'
Merge branch 'hotfix/paymentupdate' into develop

Conflicts:
	src/main/php/gettext.php
Merge branch 'release/v1.15'
gettext fixes
popup works
Merge branch 'hotfix/paymentupdate'
Merge branch 'hotfix/paymentupdate' into develop
Merge branch 'master' of github.com:webhat/Working-Title
Merge branch 'develop' of github.com:webhat/Working-Title into hotfix/fanvid
Added you are a Fan Video
Merge branch 'master' of github.com:webhat/Working-Title into hotfix/fanvid
Merge branch 'hotfix/fanvid'
Merge branch 'hotfix/fanvid' into develop
Popup box
Merge branch 'release/v1.16'
Added 404
fixed #148