Issue #114

Signed-off-by: Rafał (Rafik89) Krupiński <rafik89@extreme-fusion.pl>
Merge branch 'master' of https://github.com/extreme-fusion/eXtreme-Fusion-CMS