Bumped version number.
Merge branch 'master' into development

Conflicts:
	src/Makefile
Added .gitignore to keep .indent.pro out.