elkarte/Elkarte — pull request #1488 by emanuele45 (2014-03-18 10:19:29+00:00)
Title: Update master

Brings in the latest stuff from master