Merge branch 'random_tag_for_mtns'

Finished feature random_tag_for_mtns!
Added database to .gitignore.
Merge branch 'master' of https://github.com/yusunchina/projectZ

Update from github
all untracking cleaned up, ready to go