tell git to ignore secret_token.rb
Remove secret_token.rb from git's tracked files
Add stock_article_selection (deleting multiple stock articles at once)
Fix order.created_by
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3

Conflicts:
	app/helpers/application_helper.rb
Improve stock_article_selections
Merge pull request #28 from JuliusR/rails3

stock_article_selection ready for testing
Fix empty dd in horizontal dl
Merge branch 'rails3-fix-empty-dd' of http://github.com/balkansalat/foodsoft into rails3-fix-empty-dd
Show customer number in fax pdf
Prevent stock_articles from appearing in supplier article index
Show usefull error message for uniqueness_of_name with acts_as_paranoid.

Fixed #88
Fixed bad syntax (from already dropped meta_where gem).

Thanks to wvengen, closed #91
Apply AJAX for deleting a StockArticle
Revert 396a47b6afa5478c96dd8990a80a5437b784c0da
Revert 099e2b9b06bca02b205d15dd00c1872620c5b39f
Improve (AJAX) deletion of StockArticles
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete
Merge pull request #92 from balkansalat/rails3-ajaxArticleDelete

Delete StockArticles without reloading; small fixes, ignore secret_token initializer.
Merge remote-tracking branch 'bennibu/rails3' into rails3

Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml