resolving of templates now work
Conflicts:

	src/org/rapla/storage/impl/server/LocalAbstractCachableOperator.java
added fail tolarence if attribute not found
Conflicts:

	src/org/rapla/storage/dbsql/RaplaSQL.java