Signed-off-by: unknown <Urnotalone@Urnotalone.(none)>
Merge branch 'master' of https://github.com/Demonsu/IMSIS

Conflicts:
	public/assets/js/statistics.js

Signed-off-by: unknown <Urnotalone@Urnotalone.(none)>