Merge branch 'master' of github.com:jpaoletti/java-presentation-manager-2
merge error
ups
Merge branch 'master' of github.com:jpaoletti/java-presentation-manager-2 into entity_context
merge with update boostrap
added alignment and width to weak list
Security and interface fixes