Reload apps
Updating templates
Initial mail structure
Little change for default template
Updating dependency versions
Support for jdk8
Returning to jdk 7
Using ace instead of codemirror for scripting
Modifying also sql
Again jdk8 npn
Using jdk7 again
Upgrading versions and scripting
Using jdk7 again
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'iamedu/master'

Conflicts:
	data/fs/sites/default/js/main.js