Test only develop branch for now
Add easy extension point to configuration
Merge pull request #8 from everzet/update/travis

Update test env and project configuration
+ institution adding and editing fixes
+ address type constants added for consistent referencing
+ helper functions for address management
Ported cache buster code into project rather than relying on a modified
copy of Yii (resolves OE-3076)
Fix duplicate script error (OE-3076)
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
Use different connection strings for localhost and vagrant
Add missing semicolon
Fix provision setup
Merge pull request #9 from everzet/improvement/connection-string

Improve DB connection string in Vagrant setup
Fix connection sharing between local and Vagrant env
+ simpler save for adding institution
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop
Merge branch 'develop' into feature/dr-function

Conflicts:
	protected/controllers/AdminController.php
Merge pull request #10 from everzet/improvement/connection-string

Fix connection sharing between local and Vagrant env
Fix error in declaration
Allow configuration file change in Vagrant setup
Update travis config keys
[OE-2532] indicate that the user should check the episode status after deleting an event.