no message
Merge remote-tracking branch 'Nicexm/master'

Conflicts:
	forum/log/cron.php
	system/cache/cache.currency.1414603659
	system/cache/cache.language.1414603659
	system/logs/error.txt
Merge remote-tracking branch 'Nicexm/master'

Conflicts:
	forum/log/cron.php
	system/logs/error.txt
Merge pull request #21 from Luobata/master

no message