Add English localization in Link Editor
Merge remote-tracking branch 'upstream/dev' into dev
Merge pull request #7 from edspawn/dev

Website update
Merge pull request #8 from edspawn/dev

Data for website now stored in the DB
Merge pull request #6 from AriettiS/dev

Add English localization in Link Editor
Add import from moodle.
Merge pull request #9 from KaterinaShumskaya/dev

Add import from moodle.
Fixing gitignore (causing reimport project)
Import
Fixed some errors
Cubescript disabled
Video disabled
Fixing small errors
Fixed server for android
Bunch of image upload bugs fixed