Agilefant-Agilegret/agilefant — pull request #2 by metermaid (2012-03-04 19:23:10+00:00)
Title: Stories 529/554

This pull request is so large because of my merge commits from Super America, and integration of previous commits