fixed for updates to rust and xml-rs
Merge remote-tracking branch 'HeroesGrave/master' into update-rustc

Conflicts:
	src/gl_generator/registry.rs
Fix std::slice::Items -> std::slice::Iter
Merge pull request #249 from tomaka/update-rustc

Update for rustc