Update to gitignore
Change of plans for the next release of ScrumTime.
Merge branch 'master' into develop

Conflicts:
	README.md
Corrected the readme under the angular project.