shift
Merge branch 'master' of http://github.com/hardik-panchal/brilliant

Conflicts:
	nbproject/project.properties