smaller fixes
added README.rdoc
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
restructure repo
restructure repo v2
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
first bootstrap for the JComparser
PA-101 #comments: adding framework for REST based JComparser
PA-101 #comments: adding webapp and first build
added library docu
PA-101 #comments: added HTTP Get Retrieval for requesting JSON from processeditor server
PA-109 #comments: expanding retrieval & config for JComparser
PA-109 #comments: smaller updates
added howtocommit.txt
add .gitignore
Merge branch 'JEngine-Java-V2' of https://github.com/BP2014W1/rapid-prototype into JEngine-Java-V2

Conflicts:
	.gitignore
	JEngine-RoR/Gemfile~
	JEngine-RoR/README.rdoc~
	JEngine-RoR/app/controllers/activity_controller.rb~
	JEngine-RoR/app/controllers/set_cookies_controller.rb~
	JEngine-RoR/app/controllers/task_controller.rb~
	JEngine-RoR/app/controllers/welcome_controller.rb~
	JEngine-RoR/app/models/background.rb~
	JEngine-RoR/app/models/pcm.rb~
	JEngine-RoR/app/models/stages.rb~
	JEngine-RoR/app/views/activity/done.html.erb~
	JEngine-RoR/app/views/activity/edit.html.erb~
	JEngine-RoR/app/views/activity/new.html.erb~
	JEngine-RoR/app/views/layouts/application.html.erb~
	JEngine-RoR/app/views/set_cookies/delete_cookies.html.erb~
	JEngine-RoR/app/views/set_cookies/show_cookies.html.erb~
	JEngine-RoR/app/views/task/done.html.erb~
	JEngine-RoR/app/views/task/new.html.erb~
	JEngine-RoR/app/views/task/process_finished.html.erb~
	JEngine-RoR/app/views/welcome/index.html.erb~
	JEngine-RoR/config/routes.rb~
	JEngine-RoR/db/schema.rb~
	JEngine-RoR/db/seeds.rb~