Changed object creation to cleaner format
Created an api description which also contains basic sql definitions
Merge branch 'master' into database
Added database.js, tested some stuff with handlebars partials
Tired stuff. Idk
Added basic database functionality
Updated api description
Reverted a test change
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html
	ifiske-app/www/static/js/templates.js
Removed a comment
Some changes
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html
Merge branch 'database' of https://github.com/ifiske/ifiske into database
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/static/js/templates.js
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html
	ifiske-app/www/static/js/templates.js
Added some xml parsing
Merge branch 'database' of https://github.com/ifiske/ifiske into database

Conflicts:
	ifiske-app/www/static/js/database.js
Merge branch 'master' into database

Conflicts:
	ifiske-app/www/index.html
	ifiske-app/www/static/templates/partials.handlebars
Merge branch 'database' into search