index on master: 9349c43 Merge pull request #32 from jateeter/master
Subscription/
Merge remote-tracking branch 'upstream/master'
Revert "Small fix "ref" -> "rel" in full export header"

This reverts commit c43a3a4f0908a3b6290d07d3dae0bdaf0f7d8a81.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:MartyBurns/OpenESPI-Common-java
Merge remote-tracking branch 'upstream/master'

 aborts
fixed file to match upstream/master
added devmysql-regeneratedatabase profile which uses mysql but always regenerates the database from the internal source code model. note:thirdparty database is not correct as generated and has duplicate keys and links
Merge pull request #34 from MartyBurns/master

Create devmysql-regeneratedatabase profile and update all prepopulation files
Merge branch 'master' of http://github.com/energyos/OpenESPI-Common-java