added database.php to .gitignore
Merge remote-tracking branch 'origin/0.2.0-wip' into 0.2.0-wip
added config folder to .gitignore
Merge remote-tracking branch 'origin/0.2.0-wip' into 0.2.0-wip
Merge remote-tracking branch 'origin/0.2.0-wip' into 0.2.0-wip
Merge remote-tracking branch 'origin/0.2.0-wip' into 0.2.0-wip