Omandtc sprsec

Updated database structure
Optimized spring security


space issues here and below.

Commented code should not be added unless necessary - related to the whole branch