Merge pull request #1646 from nutan-gooru/dev-branch

 	Fixed issue with reorder
fixed compilation issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch