Vaibhav kaushal feature multi templates

Updated everything on my end to send a clean pull request. Removed the lines in travis/configuration.inc.php created by previous merge conflict to new values.