Merge branch 'master' of https://github.com/patricsvard/angular

Conflicts:
	.gitignore

Signed-off-by: Patric Svärd <megamustain@hotmail.com>