Revert "asrar removing everything from live branch."

This reverts commit 8abd1f236e94e3213c8a9a4b80b2c9ab22014116.

Conflicts:
	nbproject/project.xml