20140930_20.07
Merge branch 'master' of https://github.com/leonardoa/Mosaurus

Conflicts:

admin/templates_c/ff1e5db26f987ac4ac17583d04e48843a8b11e9f.file.new.tpl.
php