Added dexing how-to.
Merge branch 'HEAD' of https://github.com/wpatrik14/ICTDroidLab.git
Line ending or whitespace issue...
Merge branch 'master' of https://github.com/wpatrik14/ICTDroidLab.git

Conflicts:
	core/src/hu/edudroid/module/AssetReader.java
	core/src/hu/edudroid/module/ModuleLoader.java