CRAFTERCMS-96: Managing cleanup, moving or removing riles. Removed classes and removed commented code. Added javadoc to some methods
CRAFTERCMS-93: New profile-bootstrap.properties
Merge remote-tracking branch 'alvaro/master'