Re-added renderincludes for MP
Merged changes
Added helper comments and started moving percentage view around
Merged conflicts
Got deployment to beanstalk working
Merged changes