Creating template
Merge remote-tracking branch 'openshift/master'
Merge branch 'master' of https://github.com/Athou/commafeed

Conflicts:
	.openshift/action_hooks/pre_build_jbosseap-6.0
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed

Conflicts:
	.openshift/action_hooks/pre_build_jbosseap-6.0
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Merge branch 'master' of https://github.com/Athou/commafeed
Update nl.properties

Contact me if you think something is wrong.
Merge pull request #423 from Koaieus/patch-1

Update nl.properties
added new theme
new theme
added new theme