Only use array keys if it is an array
Replace styling with original styling till we decide to enable the theme
Merge pull request #103 from kehh/disableNewTheme

Replace styling with original styling till we decide to enable the theme
Merge pull request #102 from kehh/fixRelationshipGenerator

Only use array keys if it is an array
Merge branch 'develop' into mergeUpstream20140821