initial build

Change-Id: I9c3fce9ada65c741ce50e0f80b200486ae742be7
Merge commit 'd58c400e8eb8f0a5d28541f95cd92f27924882ce'

Conflicts:
	build/classes/com/trc/user/activation/simple/SimpleActivationManager.class
	build/classes/com/trc/web/session/cache/CacheManager.class