.gitignore is now working
Merge branch 'master' of https://github.com/softdevelop/instagress

Conflicts:
	trunk/protected/modules/user/controllers/AccountController.php
	trunk/protected/runtime/application.log
m