Added locally referenced libraries
Merge remote-tracking branch 'choose_remote_name/2013' into 2013

Conflicts:
	ProxyCKPD/.classpath