Gitignore updated
Merge branch 'master' of github.com:malclocke/fulcrum
Whitespaces removed
More appropriate solution
Add Japanese locale support
Add ja to Javascript translations
Add updating js to translation notes
confirm before clear story
Merge branch 'icons_whitespace' of https://github.com/ZakharDay/fulcrum into ZakharDay-icons_whitespace
Updating `devise` to 2.0.5.

Security update. CVE: 2013-0233, see http://osvdb.org/show/osvdb/89642
Merge branch 'master' into tasks_list

Conflicts:
	app/assets/javascripts/i18n/translations.js