Added .idea folder to .gitignore
Basic changes made to Views, modifying UI strings
Merge branch 'master' of https://github.com/abhshkrv/Wiselib-Online.git

Conflicts:
	.gitignore
	.idea/frameworkRootSettings.xml
	.idea/tzikis.iml
	Symfony/app/Resources/views/base.html.twig
	Symfony/app/config/config.yml