Added gitignore
Merge remote-tracking branch 'origin/webversion' into webversion

Conflicts:
	application/models/Database.php
TEST