Iter
Merge branch 'master' of https://github.com/AlexandreAbraham/frontiers2013

Conflicts:
	frontiers.bbl