Fixed link styles site-wide
Add ability for competition organizer to hide results in a phase per #315 and enhance submission table per #318.
Fixing merge conflicts locally
Merge pull request #326 from cpoulain/master

Add ability for competition organizers to hide results in a phase per #315
Git rm'd uneccessary files
Make deployment work even when bundle service and SSL config parameters are missing for backwards compatibility.
Merge pull request #330 from cpoulain/master

Make deployment work when bundle service and SSL config are not specified
Upldate template for local configuration settings
Merge branch 'master' of https://github.com/codalab/codalab
Merge pull request #333 from cpoulain/master

Update template for local configuration settings
Merge branch 'master' into dev

Conflicts:
	codalab/apps/api/routers.py
	codalab/apps/api/views.py
	codalab/apps/web/models.py
	codalab/apps/web/views.py
	codalab/codalab/settings/local_sample.py