.gitignore: removed .htaccess and database.php
samples for gitignore removed files
Merge branch 'master' into dev