ADDED Tempalte functionality
Fixed template Provider
cleanup
Moved template setup to database
added serialization tests
asdasd
Merge remote-tracking branch 'upstream/master'