level up ;]
part 2
Merge branch 'master' into add_meta_data

Conflicts:
	src/pl/edu/agh/toik/bughandler/Handler.aj
	src/pl/edu/agh/toik/bughandler/test/Test.java
	src/pl/edu/agh/toik/bughandler/util/BadParametersException.java