Added Language factory to handle translations - must include language of your choice
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Merge branch 'master' of https://github.com/luigimassa/devfest-template