added basic tags funtionality
Merge branch 'master' of github.com:mihai-chezan/xpress