updated core
Merge branch 'master' of https://github.com/dextorer/MHDParis2014
Merge branch 'master' of https://github.com/dextorer/MHDParis2014
Merge branch 'master' of https://github.com/dextorer/MHDParis2014
merged from frontend
Merge branch 'master' of https://github.com/dextorer/MHDParis2014