giix + db.php
gitignor
merge dev into master