- Adding ehcache JMX monitoring
- run jconsole from shell prompt
- select sbt-launch.jar play
- monitor MBeans/net.sf.ehcache/CacheStatistics
Merge remote-tracking branch 'origin/master'

Conflicts:
	conf/ehcache.xml