Merge remote-tracking branch 'origin/reuse-abstract' into RaulBranch
Added a starting point to full feature testing with protractor
Merge remote-tracking branch 'origin/reuse-abstract' into FullFeatureTesting

Conflicts:
	test/backend-tests/restAPITests.js
tested wiki wrapper.
refractored the code, names of files and functions.

Added some tests.
Added Wiki model and mongoose deletion of object in e2e test
Merge remote-tracking branch 'origin/RaulBranchMartinStayAway' into FullFeatureTesting

Conflicts:
	test/e2e-tests/scenarios.js
	test/karma-tests/app/categories/categories.js
Merge remote-tracking branch 'origin/reuse-abstract' into FullFeatureTesting
Merge remote-tracking branch 'origin/RestBDD' into FullFeatureTesting

Conflicts:
	test/backend-tests/rest/restAPITests.js
Refactored names of view wiki and categories in the respective places.
Refactored and recoded wiki view related stuff to fit its' intended purpose. Fix protractor scenario.
Added test for find, not complete.
Merge remote-tracking branch 'origin/RefactoryingTime' into RestBDD
Finished initial REST + all the testing for it.