Merge branch 'ticket/71' into develop

James Moger

2014-05-12 a3dd0d0416fe093852293bcedb83c9b1e6fe06cb

 .gitignore

@@ -24,3 +24,4 @@
/*.sh
/*.factorypath
/src/main/dagger
/src/main/java/.idea