changes to tags
fixed conflict in schema
home page
fix conflict
ready for test
Merge pull request #47 from pedrogrande/master

Updated interface