Split generation into prep and post prep
Merge branch 'master' of https://github.com/SpringOne2GX-2014/spring-xd-smartgrid