Rewrote the rest stuff from flask-rest to flask-restful
Merge remote-tracking branch 'origin/master'

Conflicts:
	models.py
	ownpass.py
	passwords.py