Merge branch 'master' of https://github.com/wensonz/rome
Merge branch 'master' of https://github.com/wensonz/rome
	modified:   augustus/src/component.json
	modified:   augustus/src/tag.js
	modified:   vatican/src/component.json
Merge branch 'master' of https://github.com/wensonz/rome

Conflicts:
	augustus/src/component.json
	vatican/src/component.json
	modified:   ../augustus/src/component.json
	modified:   ../augustus/src/generator.js
	modified:   ../augustus/src/tag.js
	modified:   ../vatican/src/component.json
Merge branch 'master' of https://github.com/wensonz/rome
	modified:   augustus/src/component.json
	new file:   caligula/config.json
	modified:   vatican/src/component.json
	modified:   augustus/src/tag.js
Merge branch 'master' of https://github.com/wensonz/rome

Conflicts:
	augustus/src/tag.js
Merge pull request #17 from whyreal/master

some little bugs & config.json