Adjusting for merging
Small changes on ProcessLifecycle.java.
deleted files from repository
Merge branch 'master' of https://github.com/n3phele/core

Conflicts:
	n3phele/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	n3phele/war/WEB-INF/appengine-generated/local_db.bin