Moved my specific ant things to custom_rules.xml

Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
Merge branch 'dev'

Conflicts:
	build.xml