Added Netbeans to .gitignore
Added development info.
Merge branch 'development'

Conflicts:
	.gitignore
	README.md
Set Version to 2.1.0 instead of 2.1 in order to work correctly with bower.