bug fixed
Conflicts fixed
Merge branch 'phase1' of https://github.com/cirakas/ilids into phase1