Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Added versions for feed-the-beast-server