Merge branch 'release/2013-12-13'
Merge branch 'release/2013-12-23'
Merge branch 'release/2013-12-25'
Merge branch 'release/2014-01-07'
Fix avatars
Update Meteor version
Merge branch 'develop'
Update deploy instructions
Remove password.txt from deploy steps
Merge branch 'release/2014-02-26' into develop
Add Mathijs' avatar
Merge branch 'develop' into new-homepage

Conflicts:
	server/employees.js
Remove commented out people