Minor changes on basicconcept
Merge branch 'dev' of https://github.com/shilad/sem-tag into dev
File moves
Merge branch 'dev' of https://github.com/shilad/sem-tag into dev
Merge remote-tracking branch 'origin/dev' into dev