license.js
more strict
Merge branch 'master' into fiskekort
headline
getsubscriptions, finish it
removed partial footer, etc
Added crude subscriptions definition
Merge branch 'fiskekort' of https://github.com/ifiske/ifiske into fiskekort
Merge branch 'master' into fiskekort
Added subscriptions to database and api
lists fishingcards for a customer
month viewed using letters in card list view
views subscriptions in a simple view and lists them also
no idea why the css is changed.
Merge branch 'master' into fiskekort
Merge branch 'fiskekort' into merge_fiskekort

first try. let's see if it works

Conflicts:
	ifiske-app/www/static/css/find_waters.css
	ifiske-app/www/static/js/api_request.js
	ifiske-app/www/static/js/database.js
	ifiske-app/www/static/js/index.js
	ifiske-app/www/static/js/search.js
	ifiske-app/www/static/js/templates.js
	ifiske-app/www/static/js/user.js
	ifiske-app/www/static/templates/my_cards.handlebars
	ifiske-app/www/static/templates/partials.handlebars
	ifiske-app/www/static/templates/search.handlebars
	ifiske-app/www/static/templates/start.handlebars
move function to card.js
Cards should be visible now
trying to get card to work
Merge branch 'merge_fiskekort' into ifiske2.0