2013 08 01
Merge branch 'master' of github.com:masterinho52/nxbln

Conflicts:
	.gitignore